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 51b7be7f2f7c..117f4d3476f7 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
@@ -253,9 +253,9 @@
     ],
     "test.test[aggr_factory-container-default.txt-Debug]": [
         {
-            "checksum": "d2f04c19dcb3e543fc33a84d560fa60b",
-            "size": 3482,
-            "uri": "https://{canondata_backend}/1936997/93899b3de50fae3f9677baacc98094a7a629590a/resource.tar.gz#test.test_aggr_factory-container-default.txt-Debug_/opt.yql_patched"
+            "checksum": "a5bdd9ec579c64bbaf2402275a553941",
+            "size": 3969,
+            "uri": "https://{canondata_backend}/1871182/6443891a459a88cc30d549aebbd4fd50dda7e937/resource.tar.gz#test.test_aggr_factory-container-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggr_factory-container-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
index d36f317c0db7..cb339a78e084 100644
--- a/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part4/canondata/result.json
@@ -219,9 +219,9 @@
     ],
     "test.test[aggr_factory-udaf_in_udaf-default.txt-Debug]": [
         {
-            "checksum": "1d495bde48f568ec5ef6d949262cc71b",
-            "size": 3500,
-            "uri": "https://{canondata_backend}/212715/cac0988e3f0d6d4f0bc782106479af0e9a38af20/resource.tar.gz#test.test_aggr_factory-udaf_in_udaf-default.txt-Debug_/opt.yql_patched"
+            "checksum": "e1b2951e46ff2a3be721b812c4296fe9",
+            "size": 3629,
+            "uri": "https://{canondata_backend}/1936997/73aed6912c63e0c9849547f60724686e52b76a17/resource.tar.gz#test.test_aggr_factory-udaf_in_udaf-default.txt-Debug_/opt.yql_patched"
         }
     ],
     "test.test[aggr_factory-udaf_in_udaf-default.txt-Plan]": [
diff --git a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
index bb3df182190f..9f52a9010a3f 100644
--- a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
+++ b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -1247,9 +1247,9 @@
     ],
     "test_sql2yql.test[aggr_factory-container]": [
         {
-            "checksum": "5b3bb4258f38bf04943e9d8dd6e67c7e",
-            "size": 15494,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_aggr_factory-container_/sql.yql"
+            "checksum": "63614a8cbe40be73fb609031f99f4475",
+            "size": 16294,
+            "uri": "https://{canondata_backend}/1899731/8ff3d323098c4590b50ff0ff52f90195d35236f6/resource.tar.gz#test_sql2yql.test_aggr_factory-container_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-container_empty]": [
@@ -1499,9 +1499,9 @@
     ],
     "test_sql2yql.test[aggr_factory-udaf_in_udaf]": [
         {
-            "checksum": "dd9d3d62dd6b82faa49bd46672f5535e",
-            "size": 8212,
-            "uri": "https://{canondata_backend}/1871182/6b10ad6d9884e5faf3a77187ffb9b38b59b46458/resource.tar.gz#test_sql2yql.test_aggr_factory-udaf_in_udaf_/sql.yql"
+            "checksum": "9d01409915eb820ebae2bfaaa2c16bde",
+            "size": 8412,
+            "uri": "https://{canondata_backend}/1781765/227af57ccf2ba5ca6b7eaaffd64fc6924a1bf64a/resource.tar.gz#test_sql2yql.test_aggr_factory-udaf_in_udaf_/sql.yql"
         }
     ],
     "test_sql2yql.test[aggr_factory-variance]": [
@@ -18481,9 +18481,9 @@
     ],
     "test_sql_format.test[aggr_factory-container]": [
         {
-            "checksum": "22bfa4d8986c5499bc4a0bc3f33c7e45",
-            "size": 1825,
-            "uri": "https://{canondata_backend}/937458/ee77031f79efe530ec1a9f6d0ade947cf33aa7ed/resource.tar.gz#test_sql_format.test_aggr_factory-container_/formatted.sql"
+            "checksum": "783f45cf131251c67355a4153fac2d5b",
+            "size": 2569,
+            "uri": "https://{canondata_backend}/1899731/8ff3d323098c4590b50ff0ff52f90195d35236f6/resource.tar.gz#test_sql_format.test_aggr_factory-container_/formatted.sql"
         }
     ],
     "test_sql_format.test[aggr_factory-container_empty]": [
@@ -18733,9 +18733,9 @@
     ],
     "test_sql_format.test[aggr_factory-udaf_in_udaf]": [
         {
-            "checksum": "7cedd935321f6d20653c3c694d80706a",
-            "size": 1112,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql"
+            "checksum": "22e42b98a72d5b4ec1452ecb99095a4a",
+            "size": 1154,
+            "uri": "https://{canondata_backend}/1781765/227af57ccf2ba5ca6b7eaaffd64fc6924a1bf64a/resource.tar.gz#test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql"
         }
     ],
     "test_sql_format.test[aggr_factory-variance]": [
diff --git a/ydb/library/yql/tests/sql/suites/aggr_factory/container.sql b/ydb/library/yql/tests/sql/suites/aggr_factory/container.sql
index 8e08991fd646..303e3035f16b 100644
--- a/ydb/library/yql/tests/sql/suites/aggr_factory/container.sql
+++ b/ydb/library/yql/tests/sql/suites/aggr_factory/container.sql
@@ -16,46 +16,46 @@ select ListAggregate(Nothing(ParseType("List<Int32>?")), $factory);
 
 $factory = AGGREGATION_FACTORY("sum");
 
-select DictAggregate(
+select ListSort(DictItems(DictAggregate(
     DictCreate(ParseType("String"), ParseType("List<Int32>"))
-    , $factory);
+    , $factory)));
 
-select DictAggregate(
+select ListSort(DictItems(DictAggregate(
     AsDict(
         AsTuple("foo", AsList(1, 3)), 
         AsTuple("bar", AsList(2))
-    ), $factory);
+    ), $factory)));
 
 
-select DictAggregate(
+select ListSort(DictItems(DictAggregate(
     Just(AsDict(
         AsTuple("foo", AsList(1, 3)), 
         AsTuple("bar", AsList(2))
-    )), $factory);
+    )), $factory)));
 
-select DictAggregate(
+select ListSort(DictItems(DictAggregate(
     Nothing(ParseType("Dict<String, List<Int32>>?"))
-    , $factory);
+    , $factory)));
 
 $factory = AGGREGATION_FACTORY("count");
 
-select DictAggregate(
+select ListSort(DictItems(DictAggregate(
     DictCreate(ParseType("String"), ParseType("List<Int32>"))
-    , $factory);
+    , $factory)));
 
-select DictAggregate(
+select ListSort(DictItems(DictAggregate(
     AsDict(
         AsTuple("foo", AsList(1, 3)), 
         AsTuple("bar", AsList(2))
-    ), $factory);
+    ), $factory)));
 
 
-select DictAggregate(
+select ListSort(DictItems(DictAggregate(
     Just(AsDict(
         AsTuple("foo", AsList(1, 3)), 
         AsTuple("bar", AsList(2))
-    )), $factory);
+    )), $factory)));
 
-select DictAggregate(
+select ListSort(DictItems(DictAggregate(
     Nothing(ParseType("Dict<String, List<Int32>>?"))
-    , $factory);
+    , $factory)));
diff --git a/ydb/library/yql/tests/sql/suites/aggr_factory/udaf_in_udaf.sql b/ydb/library/yql/tests/sql/suites/aggr_factory/udaf_in_udaf.sql
index 843900412e8d..49194de5071b 100644
--- a/ydb/library/yql/tests/sql/suites/aggr_factory/udaf_in_udaf.sql
+++ b/ydb/library/yql/tests/sql/suites/aggr_factory/udaf_in_udaf.sql
@@ -21,5 +21,5 @@ $count_list_values = AGGREGATION_FACTORY(
 
 $test_data = AsList(AsList(1,2),AsList(3,2),AsList(3,3),AsList(1,3),AsList(3,1),AsList(2,2));
 SELECT
-    ListAggregate(AsList(1,2,3,2,3,3), $count_values) AS count_values,
-    ListAggregate($test_data, $count_list_values) AS count_list_values,
+    ListSort(DictItems(ListAggregate(AsList(1,2,3,2,3,3), $count_values))) AS count_values,
+    ListSort(DictItems(ListAggregate($test_data, $count_list_values))) AS count_list_values,
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 ca7b71f3723b..06900a72da84 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
@@ -226,9 +226,9 @@
     ],
     "test.test[aggr_factory-container-default.txt-Debug]": [
         {
-            "checksum": "2c12fa11ceabeab21bdcf87793c6e97b",
-            "size": 3412,
-            "uri": "https://{canondata_backend}/212715/e1bc1d6e31fa656365a738e65224a7c3f774bae6/resource.tar.gz#test.test_aggr_factory-container-default.txt-Debug_/opt.yql"
+            "checksum": "5182bc8bb4e473a97e7d6320def92022",
+            "size": 3899,
+            "uri": "https://{canondata_backend}/1937001/921950479840accbb70941829ebc5ce822471db2/resource.tar.gz#test.test_aggr_factory-container-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[aggr_factory-container-default.txt-Plan]": [
@@ -240,9 +240,9 @@
     ],
     "test.test[aggr_factory-container-default.txt-Results]": [
         {
-            "checksum": "e399cfe7c1e60b323413cc8bd8b8d70a",
-            "size": 15764,
-            "uri": "https://{canondata_backend}/212715/e1bc1d6e31fa656365a738e65224a7c3f774bae6/resource.tar.gz#test.test_aggr_factory-container-default.txt-Results_/results.txt"
+            "checksum": "863241bf2dcb7d70982932141e39343b",
+            "size": 18060,
+            "uri": "https://{canondata_backend}/1937001/921950479840accbb70941829ebc5ce822471db2/resource.tar.gz#test.test_aggr_factory-container-default.txt-Results_/results.txt"
         }
     ],
     "test.test[aggr_factory-multi_struct_nulls-default.txt-Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json
index c86caecbba3f..441418a53959 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part4/canondata/result.json
@@ -197,9 +197,9 @@
     ],
     "test.test[aggr_factory-udaf_in_udaf-default.txt-Debug]": [
         {
-            "checksum": "38bc734c8e0882858725cb6530c51723",
-            "size": 3423,
-            "uri": "https://{canondata_backend}/1871182/c50b95fdb7c8929b781a02f15a556360fd4cef36/resource.tar.gz#test.test_aggr_factory-udaf_in_udaf-default.txt-Debug_/opt.yql"
+            "checksum": "3e142fa9e31bf2957686e8db3e87748e",
+            "size": 3552,
+            "uri": "https://{canondata_backend}/1936997/5f59e67a9ff55c74b3287083a4ffb030a9bbbb86/resource.tar.gz#test.test_aggr_factory-udaf_in_udaf-default.txt-Debug_/opt.yql"
         }
     ],
     "test.test[aggr_factory-udaf_in_udaf-default.txt-Plan]": [
@@ -211,9 +211,9 @@
     ],
     "test.test[aggr_factory-udaf_in_udaf-default.txt-Results]": [
         {
-            "checksum": "ab95d6bad220a26f9de3081699929f2e",
-            "size": 2985,
-            "uri": "https://{canondata_backend}/1942415/3e574b859a40e2b3256cdf6f28ee558b38ef8261/resource.tar.gz#test.test_aggr_factory-udaf_in_udaf-default.txt-Results_/results.txt"
+            "checksum": "de079940fa14c016b6304f22057d82f1",
+            "size": 3579,
+            "uri": "https://{canondata_backend}/1936997/5f59e67a9ff55c74b3287083a4ffb030a9bbbb86/resource.tar.gz#test.test_aggr_factory-udaf_in_udaf-default.txt-Results_/results.txt"
         }
     ],
     "test.test[aggregate-aggregate_distinct_expr-default.txt-Debug]": [