diff --git a/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json
index 0ce65252a2e4..51b7be7f2f7c 100644
--- a/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part13/canondata/result.json
@@ -1611,9 +1611,9 @@
     ],
     "test.test[optimizers-yson_dup_serialize--Debug]": [
         {
-            "checksum": "e10a54807101e45ba3af71268a2d5ed3",
-            "size": 1872,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_optimizers-yson_dup_serialize--Debug_/opt.yql_patched"
+            "checksum": "89c2555f3b394bc0e75d0238f9714061",
+            "size": 1925,
+            "uri": "https://{canondata_backend}/1784826/622e82c1e9ba6061cf75850baedc802cefade6ad/resource.tar.gz#test.test_optimizers-yson_dup_serialize--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yson_dup_serialize--Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json
index 40260effcb37..90a97788e6ce 100644
--- a/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part16/canondata/result.json
@@ -1848,23 +1848,23 @@
     "test.test[optimizers-wide_if_present_over_double_just-default.txt-Results]": [],
     "test.test[optimizers-yql-8041-fuse_with_desc_map--Analyze]": [
         {
-            "checksum": "53cb9bd17c4438fd7121b6cd92a0ef37",
-            "size": 5463,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Analyze_/plan.txt"
+            "checksum": "4bcb902c7f618647110ca5774a21861e",
+            "size": 6060,
+            "uri": "https://{canondata_backend}/1784826/8a1791d883c330f1ed18937b9d7a33af5031d735/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Analyze_/plan.txt"
         }
     ],
     "test.test[optimizers-yql-8041-fuse_with_desc_map--Debug]": [
         {
-            "checksum": "3a1be63b7e2c7061fb02957674de5b85",
-            "size": 2338,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Debug_/opt.yql_patched"
+            "checksum": "54ab3d385eead597eec37f758eeabd25",
+            "size": 2460,
+            "uri": "https://{canondata_backend}/1784826/8a1791d883c330f1ed18937b9d7a33af5031d735/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Debug_/opt.yql_patched"
         }
     ],
     "test.test[optimizers-yql-8041-fuse_with_desc_map--Plan]": [
         {
-            "checksum": "53cb9bd17c4438fd7121b6cd92a0ef37",
-            "size": 5463,
-            "uri": "https://{canondata_backend}/1599023/6ea95a71ae6e3995d639ef495d263a106e521882/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Plan_/plan.txt"
+            "checksum": "4bcb902c7f618647110ca5774a21861e",
+            "size": 6060,
+            "uri": "https://{canondata_backend}/1784826/8a1791d883c330f1ed18937b9d7a33af5031d735/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Plan_/plan.txt"
         }
     ],
     "test.test[optimizers-yql-8041-fuse_with_desc_map--Results]": [],
diff --git a/ydb/library/yql/tests/sql/dq_file/part9/canondata/test.test_hor_join-yql-12610_old_table_props-default.txt-Analyze_/extracted b/ydb/library/yql/tests/sql/dq_file/part9/canondata/test.test_hor_join-yql-12610_old_table_props-default.txt-Analyze_/extracted
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/ydb/library/yql/tests/sql/dq_file/part9/canondata/test.test_hor_join-yql-12610_old_table_props-default.txt-Results_/extracted b/ydb/library/yql/tests/sql/dq_file/part9/canondata/test.test_hor_join-yql-12610_old_table_props-default.txt-Results_/extracted
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
index 0fa432fd8baf..4a8c72f23254 100644
--- a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
+++ b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -10053,9 +10053,9 @@
     ],
     "test_sql2yql.test[optimizers-yql-8041-fuse_with_desc_map]": [
         {
-            "checksum": "ff1aea3d93d83940ff2df2e0cf47e8bd",
-            "size": 2331,
-            "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_optimizers-yql-8041-fuse_with_desc_map_/sql.yql"
+            "checksum": "ef951c7bc176a7705858c06e3e0afa31",
+            "size": 2395,
+            "uri": "https://{canondata_backend}/1936842/9da17f420e478992cf6c97d9a8ec2f53cf0578f3/resource.tar.gz#test_sql2yql.test_optimizers-yql-8041-fuse_with_desc_map_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-yql-8223_direct_row_and_skipnullmembers]": [
@@ -10095,9 +10095,9 @@
     ],
     "test_sql2yql.test[optimizers-yson_dup_serialize]": [
         {
-            "checksum": "33060d49a57287384a67127042886cce",
-            "size": 3244,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_optimizers-yson_dup_serialize_/sql.yql"
+            "checksum": "a891e1a0b0e19bbdd1e5cc5360a2a720",
+            "size": 3402,
+            "uri": "https://{canondata_backend}/1936273/29d40372523e1255c2df44e13891a9856f7ffd81/resource.tar.gz#test_sql2yql.test_optimizers-yson_dup_serialize_/sql.yql"
         }
     ],
     "test_sql2yql.test[optimizers-yt_shuffle_by_keys]": [
@@ -27259,9 +27259,9 @@
     ],
     "test_sql_format.test[optimizers-yql-8041-fuse_with_desc_map]": [
         {
-            "checksum": "dce3e6240f8842fcd2c0b78cdc698c99",
-            "size": 240,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_optimizers-yql-8041-fuse_with_desc_map_/formatted.sql"
+            "checksum": "a811c61c63a59d094e444e4b97ad9888",
+            "size": 257,
+            "uri": "https://{canondata_backend}/1936842/9da17f420e478992cf6c97d9a8ec2f53cf0578f3/resource.tar.gz#test_sql_format.test_optimizers-yql-8041-fuse_with_desc_map_/formatted.sql"
         }
     ],
     "test_sql_format.test[optimizers-yql-8223_direct_row_and_skipnullmembers]": [
@@ -27301,9 +27301,9 @@
     ],
     "test_sql_format.test[optimizers-yson_dup_serialize]": [
         {
-            "checksum": "9b4e9c549a28573dcf8f194f39735768",
-            "size": 296,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_optimizers-yson_dup_serialize_/formatted.sql"
+            "checksum": "18c0d5b8e0d937d3a537fc5006f69be3",
+            "size": 333,
+            "uri": "https://{canondata_backend}/1936273/29d40372523e1255c2df44e13891a9856f7ffd81/resource.tar.gz#test_sql_format.test_optimizers-yson_dup_serialize_/formatted.sql"
         }
     ],
     "test_sql_format.test[optimizers-yt_shuffle_by_keys]": [
diff --git a/ydb/library/yql/tests/sql/suites/optimizers/yql-8041-fuse_with_desc_map.sql b/ydb/library/yql/tests/sql/suites/optimizers/yql-8041-fuse_with_desc_map.sql
index 216ba16b172c..2231c4690009 100644
--- a/ydb/library/yql/tests/sql/suites/optimizers/yql-8041-fuse_with_desc_map.sql
+++ b/ydb/library/yql/tests/sql/suites/optimizers/yql-8041-fuse_with_desc_map.sql
@@ -13,4 +13,5 @@ $i = (
 
 select distinct key
 from $i
-where value != "";
+where value != ""
+order by key;
diff --git a/ydb/library/yql/tests/sql/suites/optimizers/yson_dup_serialize.sql b/ydb/library/yql/tests/sql/suites/optimizers/yson_dup_serialize.sql
index f727f2b4668d..ead013f3b6d5 100644
--- a/ydb/library/yql/tests/sql/suites/optimizers/yson_dup_serialize.sql
+++ b/ydb/library/yql/tests/sql/suites/optimizers/yson_dup_serialize.sql
@@ -4,4 +4,4 @@ $l = ($x)->( ListMap($x, Yson::Serialize) );
 $d = ($x)->( ToDict(ListMap(DictItems($x),($i)->(($i.0,Yson::Serialize($i.1))))));
 
 select $l($l(Yson::ConvertToList(Yson("[1;2;3]"))));
-select $d($d(Yson::ConvertToDict(Yson("{a=1;b=2}"))));
\ No newline at end of file
+select ListSort(DictItems($d($d(Yson::ConvertToDict(Yson("{a=1;b=2}"))))), ($x)->($x.0));
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json
index ae46ae541db5..ca7b71f3723b 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part13/canondata/result.json
@@ -1550,9 +1550,9 @@
     ],
     "test.test[optimizers-yson_dup_serialize--Debug]": [
         {
-            "checksum": "b0e92ced6b0465208b53ae25b4ff7911",
-            "size": 1800,
-            "uri": "https://{canondata_backend}/212715/e1bc1d6e31fa656365a738e65224a7c3f774bae6/resource.tar.gz#test.test_optimizers-yson_dup_serialize--Debug_/opt.yql"
+            "checksum": "d4c9ddd001cf2586aa1613ad3d6792c7",
+            "size": 1853,
+            "uri": "https://{canondata_backend}/1784826/44ae518af5f2d678a5794dca6d9e725689502b2a/resource.tar.gz#test.test_optimizers-yson_dup_serialize--Debug_/opt.yql"
         }
     ],
     "test.test[optimizers-yson_dup_serialize--Plan]": [
@@ -1564,9 +1564,9 @@
     ],
     "test.test[optimizers-yson_dup_serialize--Results]": [
         {
-            "checksum": "d925282e3351eb096faf0021843ad9f1",
-            "size": 2835,
-            "uri": "https://{canondata_backend}/212715/e1bc1d6e31fa656365a738e65224a7c3f774bae6/resource.tar.gz#test.test_optimizers-yson_dup_serialize--Results_/results.txt"
+            "checksum": "2ab805a8b49f70939bbf79bee9fe813f",
+            "size": 3112,
+            "uri": "https://{canondata_backend}/1937367/004cb91838707c81c0d57c2b07e9afea4c50aed4/resource.tar.gz#test.test_optimizers-yson_dup_serialize--Results_/results.txt"
         }
     ],
     "test.test[order_by-assume_with_transform_desc--Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json
index 1c78e77eaa93..75a516560dd9 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part16/canondata/result.json
@@ -1428,16 +1428,16 @@
     ],
     "test.test[optimizers-yql-8041-fuse_with_desc_map--Debug]": [
         {
-            "checksum": "b5483704d8d0bca64ca2027ab2d2a00e",
-            "size": 3855,
-            "uri": "https://{canondata_backend}/1924537/d66bfe69aa802f6a81aadbac897621b721f31b4b/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Debug_/opt.yql"
+            "checksum": "2717a772d77025e81b75d42d41aeefd7",
+            "size": 4287,
+            "uri": "https://{canondata_backend}/1814674/76ae7e4a26a3fb34f020c3a2956bf4ea4b655461/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Debug_/opt.yql"
         }
     ],
     "test.test[optimizers-yql-8041-fuse_with_desc_map--Plan]": [
         {
-            "checksum": "c4c7bef845afc95d4f164ff105eed473",
-            "size": 7116,
-            "uri": "https://{canondata_backend}/1924537/d66bfe69aa802f6a81aadbac897621b721f31b4b/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Plan_/plan.txt"
+            "checksum": "ba2926eee00384f6f8549945a69b00c8",
+            "size": 8048,
+            "uri": "https://{canondata_backend}/1814674/76ae7e4a26a3fb34f020c3a2956bf4ea4b655461/resource.tar.gz#test.test_optimizers-yql-8041-fuse_with_desc_map--Plan_/plan.txt"
         }
     ],
     "test.test[optimizers-yql-8041-fuse_with_desc_map--Results]": [