diff --git a/dbms/tests/queries/0_stateless/00381_first_significant_subdomain.reference b/dbms/tests/queries/0_stateless/00381_first_significant_subdomain.reference
index 7f8c9ba186c..37a82987f34 100644
--- a/dbms/tests/queries/0_stateless/00381_first_significant_subdomain.reference
+++ b/dbms/tests/queries/0_stateless/00381_first_significant_subdomain.reference
@@ -1,3 +1,3 @@
 canada	congo	net-domena
 yandex	yandex		yandex	yandex	яндекс	яндекс	yandex
-canada	hello	hello	hello	hello	hello									canada	canada
+canada		hello	hello											canada	
diff --git a/dbms/tests/queries/1_stateful/00037_uniq_state_merge1.reference b/dbms/tests/queries/1_stateful/00037_uniq_state_merge1.reference
index d9ca7e3be21..f0a48df0f91 100644
--- a/dbms/tests/queries/1_stateful/00037_uniq_state_merge1.reference
+++ b/dbms/tests/queries/1_stateful/00037_uniq_state_merge1.reference
@@ -1,24 +1,16 @@
-yandex.ru	25107	25107
-	21999	21999
-public_search	16749	16749
+	85185	85185
+yandex.ru	25106	25106
 avito.ru	16523	16523
-public	15429	15429
-mail.yandex.ru	13663	13663
-yandsearch	10039	10039
-news	8827	8827
+mail.yandex.ru	13662	13662
 mail.ru	7643	7643
-doc	7537	7537
 auto.ru	7350	7350
 hurpass.com	6395	6395
 best.ru	5477	5477
 tv.yandex.ru	5341	5341
 korer.ru	4967	4967
-mail.yandsearch	4246	4246
-cars	4077	4077
-publ	3970	3970
-yandex	3845	3845
+mail.yandsearch	4244	4244
 main=hurriyet.com	3806	3806
-yandex.ua	3803	3803
+yandex.ua	3802	3802
 korablitz.ru	3717	3717
 uyelik.hurriyet.com	3584	3584
 e.mail.ru	3508	3508
@@ -28,46 +20,32 @@ coccoc.com	2707	2707
 rutube.ru	2699	2699
 rbc.ru	2644	2644
 mamba.ru	2598	2598
-video	2558	2558
-mail.yandex	2447	2447
-wot	2253	2253
+mail.yandex	2443	2443
 pikabu.ru	2130	2130
 yandex.php	2057	2057
 e.mail.yandex.ru	1971	1971
 brandex.ru	1969	1969
-bravoslava-230v	1942	1942
-search	1933	1933
 market.ru	1913	1913
 mynet.ru	1881	1881
-mail	1845	1845
-mail.yandex.ua	1825	1825
+mail.yandex.ua	1824	1824
 rutube.com	1821	1821
-images	1812	1812
 news.rambler.com	1787	1787
 hurpass.com.tr	1763	1763
 ads.search	1742	1742
-marina_2_sezon	1680	1680
 cars.auto.ru	1628	1628
 cian.ru	1620	1620
 ivi.ru	1617	1617
 av.by	1598	1598
-world	1596	1596
 news.yandex.ru	1495	1495
 vk.com	1474	1474
-pub	1469	1469
-forum	1414	1414
 wow-girls.ru	1399	1399
-kinogo-dhpWXEdIcgoxWUZ6fgdTWw..	1338	1338
 uyelik.hurriyet.com.tr	1330	1330
 aukro.ua	1314	1314
-plugins	1244	1244
 images.yandsearch	1235	1235
 ondom.ru	1221	1221
 korablitz.com	1189	1189
-videovol-9-sezon	1187	1187
 kerl.org	1155	1155
 mail.yandex.php	1148	1148
-file	1147	1147
 love.mail.yandex.ru	1136	1136
 yandex.kz	1124	1124
 coccoc.com.tr	1113	1113
@@ -77,24 +55,46 @@ sprashivai.ru	1072	1072
 market.yandex.ru	1064	1064
 spb-n.ru	1056	1056
 sz.spaces.ru	1055	1055
-xofx.net%2F63857&secret-oper=reply&id=0&extras]	1054	1054
 marinance.ua	1050	1050
 tube.ru	1044	1044
 haber.com	1043	1043
-image&img_url=http	1042	1042
-sport	1040	1040
 megogo.net	993	993
 sozcu.com	991	991
 yandex.by	938	938
-image&uinfo	936	936
 fast-golove.mail.ru_Mobile=0&at=35&text=производств	927	927
-linka	901	901
 gazeta.ru	892	892
-yandex.ru;yandex.ru	892	892
-kinogo-dhpWXEdIcgoxWUZ6fgdTXA..	890	890
+yandex.ru;yandex.ru	891	891
 fotki.yandex.ru	875	875
 fast-golove.mail.yandex.php	842	842
-news=previews	839	839
-faber	833	833
 lenta.ru	820	820
 publicdaroglundai_anketa.ru	813	813
+mail.yandex.kz	810	810
+censor.net	807	807
+mail.yandex.by	805	805
+nnn.ru	796	796
+maxi.su	788	788
+rambler.ru	755	755
+hurpass.com.ua	729	729
+g1.botva.lv	728	728
+m.sport.airway	724	724
+tvizle.com	723	723
+fast-golove.mail.yandex.ru	712	712
+spb.ru	693	693
+eksisozluk.com	689	689
+uyelik.hurriyet	666	666
+rst.ua	650	650
+deko.ru	647	647
+my.mail.yandex.ru	647	647
+astrov.pro	625	625
+yandsearch.php	624	624
+kinogo.net	617	617
+fanati-avtomobile.jsp	611	611
+tv.yandsearch	605	605
+soft.ru	603	603
+pluginplus.ru	601	601
+images.yandex	595	595
+1tv.rbc.ru	592	592
+ria.ru	591	591
+marina_prezideniz.hurriyet.com	578	578
+youtube.ru	575	575
+cars.autochno.ru	570	570
diff --git a/dbms/tests/queries/1_stateful/00038_uniq_state_merge2.reference b/dbms/tests/queries/1_stateful/00038_uniq_state_merge2.reference
index 926cb1911ba..0ea3994f453 100644
--- a/dbms/tests/queries/1_stateful/00038_uniq_state_merge2.reference
+++ b/dbms/tests/queries/1_stateful/00038_uniq_state_merge2.reference
@@ -1,100 +1,100 @@
-	582035	80248
-ru	299420	71339
-com	78253	34500
-html	40288	19569
-ua	33160	18847
-tr	19570	13117
-net	19003	12908
-php	17817	12011
-yandsearch	13598	10329
-by	9349	7695
-yandex	8946	7282
-org	5897	5320
-tv	5371	4660
-kz	5175	4588
-aspx	3084	2800
-phtml	3012	2725
-xml	2993	2726
-tr&callback_url=http	2897	2681
-su	2833	2587
-shtml	2442	2218
-hurriyet	2030	1907
-search	1915	1904
-tr&user	1556	1494
-jpg	1531	1427
-tr&users	1449	1373
-tr&callback	1294	1244
-jsp	1083	1048
-net%2F63857&secret-oper=reply&id=0&extras]	1054	1054
-htm	957	921
+ru	282356	70396
+	96315	85424
+com	72459	33535
+html	33195	17665
+ua	31469	18290
+tr	18197	12501
+net	17633	12318
+php	16416	11358
+yandsearch	12917	9992
+by	8690	7254
+yandex	8004	6661
+org	5397	4920
+tv	4957	4360
+kz	4915	4388
+phtml	2754	2529
+tr&callback_url=http	2742	2556
+su	2731	2505
+xml	2731	2520
+aspx	2593	2394
+search	1854	1844
+shtml	1788	1688
+hurriyet	1517	1468
+tr&user	1469	1419
+tr&users	1361	1299
+tr&callback	1197	1157
+jpg	1129	1094
+jsp	1028	1000
 ru_Mobile=0&at=35&text=производств	927	927
-lv	916	910
-tr&user_page	916	885
-exe	911	891
-me	911	864
-tr&user_page=http	900	868
-do	864	838
-tr&used	782	768
-pro	778	772
+lv	897	892
+tr&user_page=http	859	831
+tr&user_page	858	834
+exe	853	837
+me	791	754
+tr&used	761	747
+pro	757	753
+htm	756	736
+do	747	730
 airway	724	724
-biz	685	672
-mail	677	660
-info	593	575
-tr&callback_url=https	534	526
-tr%2Fgaleri	533	522
+mail	632	618
+biz	623	612
+info	525	515
 bstatistik_dlja-dlya-naches	521	521
-sx	498	496
-ru%2Fupload	497	492
-news	492	487
-hu	486	479
-aspx&referer	473	459
+tr&callback_url=https	508	501
+news	469	464
+sx	465	464
 pogoda	460	460
-auto	438	429
-az	434	425
-net%2F63857&secret=506d9e3dfbd268e6b6630e58	432	432
+hu	432	429
 sportlibrary	431	431
-jpg,http	411	397
-tr&callbusiness	410	407
-fm	405	400
-online	401	399
-tr&callbusines	388	384
-ru%2Fnews	387	382
+aspx&referer	407	395
+auto	406	398
+tr&callbusiness	398	395
+az	393	385
+fm	387	386
+online	382	380
 bstatistic	366	366
-wbp	346	346
-am	336	333
-ru;yandsearch	330	328
-tr&user_page=https	330	328
-tr&callback_url	329	319
-html&lang=ru&lr=110&category=dressages%2Fcs306755	328	328
-pl	328	326
-blog	327	326
-jpg&pos	307	302
-bstana	305	305
-ru;yandex	287	284
-im	283	278
-diary	277	275
-slando	276	274
-eu	274	269
-to	271	269
-asp	253	250
-html&lang	253	248
-mynet	253	251
-tj	242	241
-sberbank	241	238
-haber	234	227
-jpg,https	232	232
-cc	226	221
+tr&callbusines	365	362
+wbp	344	344
+tr&user_page=https	326	325
+ru;yandsearch	322	321
+tr&callback_url	307	297
+bstana	304	304
+am	292	290
+ru;yandex	279	276
+blog	274	274
+pl	273	271
+diary	267	265
+jpg,http	267	261
+slando	260	258
+eu	256	253
+im	248	245
+to	242	240
+tj	231	231
+mynet	226	225
+sberbank	224	224
 _2544	222	222
-ws	221	219
-mamba	220	220
 liveinteria	218	218
-tr%2Fanasayfa	215	210
+mamba	217	217
+jpg,https	215	215
 tr&user_pts=&states	213	213
-yandsearchplus	212	211
-jpg","photo	211	209
-ru%2Fwww	211	211
-com&callback_url=http	209	208
+jpg&pos	212	210
+html&lang	211	207
 auto-supers	208	208
-co	206	205
-kg	206	205
-ru%2Fuploads	206	205
+yandsearchplus	205	204
+asp	201	198
+aspx&referera	201	201
+bstatistik_dlja-dlya_avia	201	201
+bstanii_otryasam	200	200
+wroad_5d	200	200
+com&callback_url=http	198	198
+ru&pos=3_0	198	198
+haber	196	191
+ws	194	193
+kg	191	190
+video	190	190
+co	188	188
+bstan	187	187
+swf	186	186
+cc	185	182
+turkasovki	183	183
+wssp	176	176
diff --git a/dbms/tests/queries/1_stateful/00044_any_left_join_string.reference b/dbms/tests/queries/1_stateful/00044_any_left_join_string.reference
index a96e3c9f457..f5ef97e01d7 100644
--- a/dbms/tests/queries/1_stateful/00044_any_left_join_string.reference
+++ b/dbms/tests/queries/1_stateful/00044_any_left_join_string.reference
@@ -1,10 +1,10 @@
+	3959563	550936
 auto.ru	576845	8935
-yandex.ru	410788	111278
-public	328528	23
-	313516	26015
-public_search	311125	0
+yandex.ru	410783	111278
 korer.ru	277987	0
 avito.ru	163820	15556
-mail.yandex.ru	152469	1046
+mail.yandex.ru	152468	1046
 main=hurriyet.com	152096	259
-wot	116912	6682
+mail.ru	87949	22225
+best.ru	58537	55
+korablitz.ru	51844	0
diff --git a/dbms/tests/queries/1_stateful/00089_position_functions_with_non_constant_arg.reference b/dbms/tests/queries/1_stateful/00089_position_functions_with_non_constant_arg.reference
index ad9a93d1113..530d00668a4 100644
--- a/dbms/tests/queries/1_stateful/00089_position_functions_with_non_constant_arg.reference
+++ b/dbms/tests/queries/1_stateful/00089_position_functions_with_non_constant_arg.reference
@@ -2,8 +2,5 @@
 0
 0
 0
-http://игры на передачи пригорька россия&lr=213&rpt=simage&uinfo=ww-1905-wh-643-fw-112-rossiisoft.in.ua%2FKievav@yandex?appkey=506d9e3dfbd268e6b6630e58
-http://игры на передачи пригорька россия&lr=213&rpt=simage&uinfo=ww-1905-wh-643-fw-112-rossiisoft.in.ua%2FKievav@yandex?appkey=506d9e3dfbd268e6b6630e58
-http://ru	slovari	15
-https://ru	spb.rabota	15
-https://e	yandex	12
+http://topicId=323145-EXC=1-PG=10&from=distriruyu-redakciy-lakovora-dalgames.mail@mail.yandex.ru/yandex.ru/news.mail
+http://plugin_sd=1&ie=UTF-8&l=vi&p=AhY_cQZSQQ5JBlUEZVcJG1F4XldSeWNjVEdhen83@mail.yandsearch