diff --git a/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json
index 2d7fe0efaacf..3c05ce27fcdf 100644
--- a/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part10/canondata/result.json
@@ -2558,9 +2558,9 @@
     ],
     "test.test[window-win_func_over_group_by_list_names--Debug]": [
         {
-            "checksum": "a647467928da6e7174137e2bc48e7677",
-            "size": 7874,
-            "uri": "https://{canondata_backend}/1600758/32cfdeb8c6377a2e7e62c6c4adbb95f25af7669b/resource.tar.gz#test.test_window-win_func_over_group_by_list_names--Debug_/opt.yql_patched"
+            "checksum": "a48bb2378a65dbb6ebd0c2c3a84ed61d",
+            "size": 8005,
+            "uri": "https://{canondata_backend}/1900335/4d546a38fe607a74d6c79d97f32d6facd3565eea/resource.tar.gz#test.test_window-win_func_over_group_by_list_names--Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-win_func_over_group_by_list_names--Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json
index 4bce56d53366..a8e8c575c7d6 100644
--- a/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part11/canondata/result.json
@@ -2529,9 +2529,9 @@
     ],
     "test.test[window-current/ansi_current_with_win--Debug]": [
         {
-            "checksum": "5e3dabf3c6f91f1f9fa3f045114dba42",
-            "size": 5247,
-            "uri": "https://{canondata_backend}/1936947/a99026e839b7e22714c2a9a81971a3b5e3ed1eb4/resource.tar.gz#test.test_window-current_ansi_current_with_win--Debug_/opt.yql_patched"
+            "checksum": "5803526dd5447e490389d8c6a8321cc9",
+            "size": 5324,
+            "uri": "https://{canondata_backend}/1942415/3a3a4a1a8996b163dc05e8ea49fa0ba38acb0294/resource.tar.gz#test.test_window-current_ansi_current_with_win--Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-current/ansi_current_with_win--Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json
index 9eda044a9561..14d8c797b98b 100644
--- a/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part12/canondata/result.json
@@ -3216,9 +3216,9 @@
     ],
     "test.test[window-win_func_spec_with_part--Debug]": [
         {
-            "checksum": "bb6f7b78db19c2e717478ba1514b546d",
-            "size": 4351,
-            "uri": "https://{canondata_backend}/1880306/234eadcde1cd54bffae64f4516628981e02b093d/resource.tar.gz#test.test_window-win_func_spec_with_part--Debug_/opt.yql_patched"
+            "checksum": "024d2588525eaaa2ec4139436e0b5598",
+            "size": 4458,
+            "uri": "https://{canondata_backend}/1031349/2c567f6ebb3b1bf913dc760b3d43aee2490156f2/resource.tar.gz#test.test_window-win_func_spec_with_part--Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-win_func_spec_with_part--Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json
index 3a5026f56ba6..e84ac2575544 100644
--- a/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part14/canondata/result.json
@@ -2958,9 +2958,9 @@
     ],
     "test.test[window-current/ansi_current_mixed--Debug]": [
         {
-            "checksum": "2d7d30544c5905e0549c2ceb64f86ef8",
-            "size": 5738,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_window-current_ansi_current_mixed--Debug_/opt.yql_patched"
+            "checksum": "41e01036123245167c28b97b1f830a54",
+            "size": 5815,
+            "uri": "https://{canondata_backend}/1900335/8e75958a727e5fe318f02a03ef75c236daf441e2/resource.tar.gz#test.test_window-current_ansi_current_mixed--Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-current/ansi_current_mixed--Plan]": [
@@ -3002,9 +3002,9 @@
     ],
     "test.test[window-win_func_first_last_with_part--Debug]": [
         {
-            "checksum": "3c94d5b5cc8b19a2c7c9e4fd5297c1c3",
-            "size": 4080,
-            "uri": "https://{canondata_backend}/1936997/ad7538cf8edf8e81865f7eee42c2de851daf1211/resource.tar.gz#test.test_window-win_func_first_last_with_part--Debug_/opt.yql_patched"
+            "checksum": "406a1858c3f9b2533d0d2ef0d370b4a0",
+            "size": 4204,
+            "uri": "https://{canondata_backend}/1777230/13a939531efb4067a14f4e097b82c407f6c484fc/resource.tar.gz#test.test_window-win_func_first_last_with_part--Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-win_func_first_last_with_part--Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json
index abb3de896cd6..ae6b7e66a9db 100644
--- a/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part19/canondata/result.json
@@ -3003,9 +3003,9 @@
     ],
     "test.test[window-win_func_part_by_expr--Debug]": [
         {
-            "checksum": "213a3261c2cafeef243c8bbef7719c91",
-            "size": 3372,
-            "uri": "https://{canondata_backend}/1599023/9fb10775fd57dc9adafaafe2a658f6533a20dc46/resource.tar.gz#test.test_window-win_func_part_by_expr--Debug_/opt.yql_patched"
+            "checksum": "b8cad2400ff57933a4be0e9823a2027b",
+            "size": 3445,
+            "uri": "https://{canondata_backend}/1773845/e19fed515bf1f2a7f0b738a3e17a516cd55cdf4a/resource.tar.gz#test.test_window-win_func_part_by_expr--Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-win_func_part_by_expr--Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json
index 0bcfc7e13070..153cf221a492 100644
--- a/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part3/canondata/result.json
@@ -2519,9 +2519,9 @@
     ],
     "test.test[window-win_func_aggr_hist--Debug]": [
         {
-            "checksum": "ac53198c3a34c88360d463b2b761e234",
-            "size": 4863,
-            "uri": "https://{canondata_backend}/1031349/d86a7eaf6f5bc2cdaedba52c0890601b8cc1d981/resource.tar.gz#test.test_window-win_func_aggr_hist--Debug_/opt.yql_patched"
+            "checksum": "30be7c33f2602edf122fc9cc0dfa4441",
+            "size": 4906,
+            "uri": "https://{canondata_backend}/1871002/aabb588bc49c7d9d5fb52f9cabf8713d4f524b1a/resource.tar.gz#test.test_window-win_func_aggr_hist--Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-win_func_aggr_hist--Plan]": [
diff --git a/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json b/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
index 4d2f47bf7ac4..25347f6b5c4f 100644
--- a/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
+++ b/ydb/library/yql/tests/sql/dq_file/part8/canondata/result.json
@@ -3005,9 +3005,9 @@
     ],
     "test.test[window-current/ansi_current--Debug]": [
         {
-            "checksum": "a817f7a6a375e63cd7de5940bd04b244",
-            "size": 4128,
-            "uri": "https://{canondata_backend}/1942100/0aeaf9869b0ddd879ea5b962964545b2e8d4ee29/resource.tar.gz#test.test_window-current_ansi_current--Debug_/opt.yql_patched"
+            "checksum": "6def41d2196a6717903e066b3dbec11c",
+            "size": 4205,
+            "uri": "https://{canondata_backend}/1942278/552b5b18df350c1f7e459ee29b9782bc0ea8a7d5/resource.tar.gz#test.test_window-current_ansi_current--Debug_/opt.yql_patched"
         }
     ],
     "test.test[window-current/ansi_current--Plan]": [
diff --git a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
index ff61097f4308..1d53979b6fe2 100644
--- a/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
+++ b/ydb/library/yql/tests/sql/sql2yql/canondata/result.json
@@ -16381,23 +16381,23 @@
     ],
     "test_sql2yql.test[window-current/ansi_current]": [
         {
-            "checksum": "96b6374995132bd0e5d03e7059fd2b8c",
-            "size": 2071,
-            "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_window-current_ansi_current_/sql.yql"
+            "checksum": "7bcb8b6daafbae408dd5959604e1b2f3",
+            "size": 2125,
+            "uri": "https://{canondata_backend}/1871002/e545ae390e08839888f54fdbe17287e1fb1c3edc/resource.tar.gz#test_sql2yql.test_window-current_ansi_current_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-current/ansi_current_mixed]": [
         {
-            "checksum": "3570c1f3aae9d8c8f18c7116df6fe6d4",
-            "size": 3329,
-            "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_window-current_ansi_current_mixed_/sql.yql"
+            "checksum": "effe27926385ecacc954a2664d47e9b7",
+            "size": 3383,
+            "uri": "https://{canondata_backend}/1900335/5f1a27d57cadc5c8ba1f5cd895bce88738ce8a6b/resource.tar.gz#test_sql2yql.test_window-current_ansi_current_mixed_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-current/ansi_current_with_win]": [
         {
-            "checksum": "66069fc0a0ea19ce69c319a053b4c2a1",
-            "size": 2353,
-            "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_window-current_ansi_current_with_win_/sql.yql"
+            "checksum": "e8bbd0d53b4e8a376a0cc972be47dee0",
+            "size": 2407,
+            "uri": "https://{canondata_backend}/212715/a7c52d2a110272f238f0f7fff9cff3a6adacaf12/resource.tar.gz#test_sql2yql.test_window-current_ansi_current_with_win_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-current/session]": [
@@ -16822,9 +16822,9 @@
     ],
     "test_sql2yql.test[window-win_func_aggr_hist]": [
         {
-            "checksum": "d4e558bfda60aa28e734cac09a4fee55",
-            "size": 2589,
-            "uri": "https://{canondata_backend}/1871182/6b10ad6d9884e5faf3a77187ffb9b38b59b46458/resource.tar.gz#test_sql2yql.test_window-win_func_aggr_hist_/sql.yql"
+            "checksum": "1b0140c6a0d2e152aea7a2aed286e7ce",
+            "size": 2644,
+            "uri": "https://{canondata_backend}/1871002/c96e3417fb8f66b5eacd54fbef02ab1dc8224eef/resource.tar.gz#test_sql2yql.test_window-win_func_aggr_hist_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-win_func_aggr_stat]": [
@@ -16892,9 +16892,9 @@
     ],
     "test_sql2yql.test[window-win_func_first_last_with_part]": [
         {
-            "checksum": "ec054d1fd4c4f66abe3b09133fa5b603",
-            "size": 4268,
-            "uri": "https://{canondata_backend}/1871182/6b10ad6d9884e5faf3a77187ffb9b38b59b46458/resource.tar.gz#test_sql2yql.test_window-win_func_first_last_with_part_/sql.yql"
+            "checksum": "03bf88aabf51d57b343c6c3c680eabab",
+            "size": 4379,
+            "uri": "https://{canondata_backend}/1937367/2ff1f203c4787432c1176f49937b54e54180c90f/resource.tar.gz#test_sql2yql.test_window-win_func_first_last_with_part_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-win_func_in_lib]": [
@@ -16976,9 +16976,9 @@
     ],
     "test_sql2yql.test[window-win_func_over_group_by_list_names]": [
         {
-            "checksum": "077487b943b787b9767000c67c743fe4",
-            "size": 5338,
-            "uri": "https://{canondata_backend}/1936997/00f46808be87e2ae2d4ac3ac45675b659c5ace45/resource.tar.gz#test_sql2yql.test_window-win_func_over_group_by_list_names_/sql.yql"
+            "checksum": "a1dfb40a21c6daa7619558f5788b485b",
+            "size": 5452,
+            "uri": "https://{canondata_backend}/1942100/a880b9dd7347f1ff0cee0d2e5d7cf8ac9ebf5d2e/resource.tar.gz#test_sql2yql.test_window-win_func_over_group_by_list_names_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-win_func_over_group_by_list_names_order_prefix]": [
@@ -16990,9 +16990,9 @@
     ],
     "test_sql2yql.test[window-win_func_part_by_expr]": [
         {
-            "checksum": "a746e26877c8905fc1884dfcdd33139b",
-            "size": 3062,
-            "uri": "https://{canondata_backend}/1936947/659b615f15086142a8960946dabd06b519d43335/resource.tar.gz#test_sql2yql.test_window-win_func_part_by_expr_/sql.yql"
+            "checksum": "cf8ee349a728aae81ef5a246d0af4da2",
+            "size": 3114,
+            "uri": "https://{canondata_backend}/1937492/1c0e0692453d29c7678c079c240ac0f6151a6821/resource.tar.gz#test_sql2yql.test_window-win_func_part_by_expr_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-win_func_part_by_expr_new]": [
@@ -17032,9 +17032,9 @@
     ],
     "test_sql2yql.test[window-win_func_spec_with_part]": [
         {
-            "checksum": "72d755c5f38ee693bd8b213246234488",
-            "size": 3627,
-            "uri": "https://{canondata_backend}/1871182/6b10ad6d9884e5faf3a77187ffb9b38b59b46458/resource.tar.gz#test_sql2yql.test_window-win_func_spec_with_part_/sql.yql"
+            "checksum": "57d58757ad37ade004840950c81d534c",
+            "size": 3739,
+            "uri": "https://{canondata_backend}/1784826/7c8f5dac18511988e5aea89e0a58f14f7ec54c9b/resource.tar.gz#test_sql2yql.test_window-win_func_spec_with_part_/sql.yql"
         }
     ],
     "test_sql2yql.test[window-win_func_special]": [
@@ -31207,23 +31207,23 @@
     ],
     "test_sql_format.test[window-current/ansi_current]": [
         {
-            "checksum": "2f12b165de2cfa07e0fdded5024dd90b",
-            "size": 303,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-current_ansi_current_/formatted.sql"
+            "checksum": "266f5b2ff3aa8a9d5632430698a8f9a7",
+            "size": 315,
+            "uri": "https://{canondata_backend}/1871002/e545ae390e08839888f54fdbe17287e1fb1c3edc/resource.tar.gz#test_sql_format.test_window-current_ansi_current_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-current/ansi_current_mixed]": [
         {
-            "checksum": "a3df96d43302da1da4b3a6276568e47d",
-            "size": 717,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-current_ansi_current_mixed_/formatted.sql"
+            "checksum": "6108aa345c3b3a8faa6af8f80f6bbd19",
+            "size": 729,
+            "uri": "https://{canondata_backend}/1900335/5f1a27d57cadc5c8ba1f5cd895bce88738ce8a6b/resource.tar.gz#test_sql_format.test_window-current_ansi_current_mixed_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-current/ansi_current_with_win]": [
         {
-            "checksum": "93445ae064534f8d8d118e01dd35aca1",
-            "size": 363,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-current_ansi_current_with_win_/formatted.sql"
+            "checksum": "a53aff56648a64d3f7d4edd84f3888ab",
+            "size": 375,
+            "uri": "https://{canondata_backend}/212715/a7c52d2a110272f238f0f7fff9cff3a6adacaf12/resource.tar.gz#test_sql_format.test_window-current_ansi_current_with_win_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-current/session]": [
@@ -31648,9 +31648,9 @@
     ],
     "test_sql_format.test[window-win_func_aggr_hist]": [
         {
-            "checksum": "ed22814db6ef8d4b76ca9f8cd97d8950",
-            "size": 325,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-win_func_aggr_hist_/formatted.sql"
+            "checksum": "f296601222ff3b54ac8c4faa34953442",
+            "size": 332,
+            "uri": "https://{canondata_backend}/1871002/c96e3417fb8f66b5eacd54fbef02ab1dc8224eef/resource.tar.gz#test_sql_format.test_window-win_func_aggr_hist_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-win_func_aggr_stat]": [
@@ -31718,9 +31718,9 @@
     ],
     "test_sql_format.test[window-win_func_first_last_with_part]": [
         {
-            "checksum": "a7ccd2f7d7c6d26b62426016f2ead41b",
-            "size": 698,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-win_func_first_last_with_part_/formatted.sql"
+            "checksum": "fe5cb9a4af002ebd66b80b4b3df4c1bc",
+            "size": 719,
+            "uri": "https://{canondata_backend}/1937367/2ff1f203c4787432c1176f49937b54e54180c90f/resource.tar.gz#test_sql_format.test_window-win_func_first_last_with_part_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-win_func_in_lib]": [
@@ -31802,9 +31802,9 @@
     ],
     "test_sql_format.test[window-win_func_over_group_by_list_names]": [
         {
-            "checksum": "3a36eb2b1d518fab5b7efda6230c8fc8",
-            "size": 864,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-win_func_over_group_by_list_names_/formatted.sql"
+            "checksum": "600ab422035618818f42b0c684fea0c7",
+            "size": 896,
+            "uri": "https://{canondata_backend}/1942100/a880b9dd7347f1ff0cee0d2e5d7cf8ac9ebf5d2e/resource.tar.gz#test_sql_format.test_window-win_func_over_group_by_list_names_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-win_func_over_group_by_list_names_order_prefix]": [
@@ -31816,9 +31816,9 @@
     ],
     "test_sql_format.test[window-win_func_part_by_expr]": [
         {
-            "checksum": "36c6701721807c3c0b4d736853bcbf76",
-            "size": 434,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-win_func_part_by_expr_/formatted.sql"
+            "checksum": "0fdbfc46d17f62a3de593409baac872c",
+            "size": 444,
+            "uri": "https://{canondata_backend}/1937492/1c0e0692453d29c7678c079c240ac0f6151a6821/resource.tar.gz#test_sql_format.test_window-win_func_part_by_expr_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-win_func_part_by_expr_new]": [
@@ -31858,9 +31858,9 @@
     ],
     "test_sql_format.test[window-win_func_spec_with_part]": [
         {
-            "checksum": "0b4ace53b45ddb2c1e1a74122a25dd15",
-            "size": 530,
-            "uri": "https://{canondata_backend}/1880306/64654158d6bfb1289c66c626a8162239289559d0/resource.tar.gz#test_sql_format.test_window-win_func_spec_with_part_/formatted.sql"
+            "checksum": "9a613d708f87222e3a7cd8a2c6c15089",
+            "size": 560,
+            "uri": "https://{canondata_backend}/1784826/7c8f5dac18511988e5aea89e0a58f14f7ec54c9b/resource.tar.gz#test_sql_format.test_window-win_func_spec_with_part_/formatted.sql"
         }
     ],
     "test_sql_format.test[window-win_func_special]": [
diff --git a/ydb/library/yql/tests/sql/suites/window/current/ansi_current.sql b/ydb/library/yql/tests/sql/suites/window/current/ansi_current.sql
index c5edff252c0c..d005c57dc2d4 100644
--- a/ydb/library/yql/tests/sql/suites/window/current/ansi_current.sql
+++ b/ydb/library/yql/tests/sql/suites/window/current/ansi_current.sql
@@ -12,4 +12,4 @@ WINDOW w AS (
     PARTITION BY value
     ORDER BY key
 )
-ORDER BY value, key;
+ORDER BY value, key, subkey;
diff --git a/ydb/library/yql/tests/sql/suites/window/current/ansi_current_mixed.sql b/ydb/library/yql/tests/sql/suites/window/current/ansi_current_mixed.sql
index 415d36020ba9..b89caf963f5c 100644
--- a/ydb/library/yql/tests/sql/suites/window/current/ansi_current_mixed.sql
+++ b/ydb/library/yql/tests/sql/suites/window/current/ansi_current_mixed.sql
@@ -22,4 +22,4 @@ WINDOW w AS (
     ORDER BY key
     ROWS BETWEEN UNBOUNDED PRECEDING AND 1 FOLLOWING
 )
-ORDER BY value, key;
+ORDER BY value, key, subkey;
diff --git a/ydb/library/yql/tests/sql/suites/window/current/ansi_current_with_win.sql b/ydb/library/yql/tests/sql/suites/window/current/ansi_current_with_win.sql
index b17598be4072..8baa348440a5 100644
--- a/ydb/library/yql/tests/sql/suites/window/current/ansi_current_with_win.sql
+++ b/ydb/library/yql/tests/sql/suites/window/current/ansi_current_with_win.sql
@@ -13,4 +13,4 @@ WINDOW w AS (
     PARTITION BY value
     ORDER BY key
 )
-ORDER BY value, key;
+ORDER BY value, key, subkey;
diff --git a/ydb/library/yql/tests/sql/suites/window/win_func_aggr_hist.sql b/ydb/library/yql/tests/sql/suites/window/win_func_aggr_hist.sql
index 0746b7ae7edb..c7c506e390a4 100644
--- a/ydb/library/yql/tests/sql/suites/window/win_func_aggr_hist.sql
+++ b/ydb/library/yql/tests/sql/suites/window/win_func_aggr_hist.sql
@@ -2,4 +2,4 @@
 select subkey, HISTOGRAM(cast(key as uint32) % 10, 2.) over w1 as hh, count(key) over w1 as c, min(key) over w1 as mink, max(key) over w1 as maxk
 from plato.Input
 window w1 as (partition by subkey order by key)
-order by subkey;
+order by subkey, c;
diff --git a/ydb/library/yql/tests/sql/suites/window/win_func_first_last_with_part.sql b/ydb/library/yql/tests/sql/suites/window/win_func_first_last_with_part.sql
index d875202b7273..84de1048c66a 100644
--- a/ydb/library/yql/tests/sql/suites/window/win_func_first_last_with_part.sql
+++ b/ydb/library/yql/tests/sql/suites/window/win_func_first_last_with_part.sql
@@ -11,4 +11,4 @@ SELECT
   subkey
 FROM $input
 WINDOW w1 as (PARTITION BY key_hundred ORDER BY key)
-ORDER BY key_hundred;
+ORDER BY key_hundred, key, subkey;
diff --git a/ydb/library/yql/tests/sql/suites/window/win_func_over_group_by_list_names.sql b/ydb/library/yql/tests/sql/suites/window/win_func_over_group_by_list_names.sql
index d4975d790fec..d6ec520daeed 100644
--- a/ydb/library/yql/tests/sql/suites/window/win_func_over_group_by_list_names.sql
+++ b/ydb/library/yql/tests/sql/suites/window/win_func_over_group_by_list_names.sql
@@ -21,7 +21,7 @@ select
 from $data
 group by region, SUBSTRING(name,0,1) as prefix
 -- how to use single avg_age?
-window w1 as (partition by region order by avg(age) desc)
+window w1 as (partition by region order by avg(age) desc, prefix)
 --window w1 as (order by avg(age) desc)
-order by region, avg_age desc
+order by region, avg_age desc, prefix
 ;
diff --git a/ydb/library/yql/tests/sql/suites/window/win_func_part_by_expr.sql b/ydb/library/yql/tests/sql/suites/window/win_func_part_by_expr.sql
index f74e8bcb9d4e..f10105258034 100644
--- a/ydb/library/yql/tests/sql/suites/window/win_func_part_by_expr.sql
+++ b/ydb/library/yql/tests/sql/suites/window/win_func_part_by_expr.sql
@@ -11,4 +11,4 @@ select
   sum(age) over w1 as sum1
 from $data
 window w1 as (partition by SUBSTRING(name,0,1) as prefix order by name)
-order by prefix, region;
+order by prefix, region, name;
diff --git a/ydb/library/yql/tests/sql/suites/window/win_func_spec_with_part.sql b/ydb/library/yql/tests/sql/suites/window/win_func_spec_with_part.sql
index cbeb1fe4f535..c4ccbc43bebd 100644
--- a/ydb/library/yql/tests/sql/suites/window/win_func_spec_with_part.sql
+++ b/ydb/library/yql/tests/sql/suites/window/win_func_spec_with_part.sql
@@ -9,6 +9,6 @@ select
   row_number() over w as row,
   value
 from $input
-window w as (partition by key_hundred order by key)
-order by key_hundred, key
+window w as (partition by key_hundred order by key, value)
+order by key_hundred, key, value
 ;
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json
index 9f77b370ef38..2d32fafe2e75 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part10/canondata/result.json
@@ -2411,9 +2411,9 @@
     ],
     "test.test[window-win_func_over_group_by_list_names--Debug]": [
         {
-            "checksum": "048da34c653043538506ac5d7a256eb8",
-            "size": 11226,
-            "uri": "https://{canondata_backend}/1924537/6033fa62c3628f7f8f85fe0b254eb896d2d9c2ce/resource.tar.gz#test.test_window-win_func_over_group_by_list_names--Debug_/opt.yql"
+            "checksum": "00f6385953f1d40ffd67092ed3a578f0",
+            "size": 11338,
+            "uri": "https://{canondata_backend}/1942100/524a5544dd3a650cea2820ad88374a3f34c60249/resource.tar.gz#test.test_window-win_func_over_group_by_list_names--Debug_/opt.yql"
         }
     ],
     "test.test[window-win_func_over_group_by_list_names--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json
index 8bd68a13ecdd..fe4cc18bd595 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part11/canondata/result.json
@@ -2264,9 +2264,9 @@
     ],
     "test.test[window-current/ansi_current_with_win--Debug]": [
         {
-            "checksum": "12315fc2fc0eb45318a692973e6e31a3",
-            "size": 5314,
-            "uri": "https://{canondata_backend}/1937027/642fd2ff53bdb0fed32ca89598d70c9c5848ac20/resource.tar.gz#test.test_window-current_ansi_current_with_win--Debug_/opt.yql"
+            "checksum": "6518e4cbaab97b68f07ab0c843b99ce2",
+            "size": 5374,
+            "uri": "https://{canondata_backend}/212715/54b8f73671ef28e1368f1a4bd3a15b153c3b13d8/resource.tar.gz#test.test_window-current_ansi_current_with_win--Debug_/opt.yql"
         }
     ],
     "test.test[window-current/ansi_current_with_win--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json
index b8340135ae23..51ce8f440867 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part12/canondata/result.json
@@ -2997,9 +2997,9 @@
     ],
     "test.test[window-win_func_spec_with_part--Debug]": [
         {
-            "checksum": "97d3fa2e481dcf57ffa5bda3d9a4f87d",
-            "size": 5045,
-            "uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_window-win_func_spec_with_part--Debug_/opt.yql"
+            "checksum": "fc05d4b33d06c75d8224a9b82af0368c",
+            "size": 5103,
+            "uri": "https://{canondata_backend}/1942525/4b06e6a1e4cfe08a70574f617dcff73f5044bba6/resource.tar.gz#test.test_window-win_func_spec_with_part--Debug_/opt.yql"
         }
     ],
     "test.test[window-win_func_spec_with_part--Plan]": [
@@ -3011,9 +3011,9 @@
     ],
     "test.test[window-win_func_spec_with_part--Results]": [
         {
-            "checksum": "b93cb5de6503fe6feb7edaf4460ad441",
-            "size": 8019,
-            "uri": "https://{canondata_backend}/1942415/14c2050022adcb6379d90c4a2a09abf0847e7643/resource.tar.gz#test.test_window-win_func_spec_with_part--Results_/results.txt"
+            "checksum": "49365fba46e99d6f10e8d5b28fca85c1",
+            "size": 8018,
+            "uri": "https://{canondata_backend}/1942525/4b06e6a1e4cfe08a70574f617dcff73f5044bba6/resource.tar.gz#test.test_window-win_func_spec_with_part--Results_/results.txt"
         }
     ],
     "test.test[window-win_multiaggr_tuple-default.txt-Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json
index 646cd26c30c6..acbe947fcd12 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part14/canondata/result.json
@@ -2853,9 +2853,9 @@
     ],
     "test.test[window-current/ansi_current_mixed--Debug]": [
         {
-            "checksum": "f1301aeb1dfe1a4affd12d5687bde351",
-            "size": 5849,
-            "uri": "https://{canondata_backend}/1923547/5154c8bd8ef9ead4f609771f831f20c15e795571/resource.tar.gz#test.test_window-current_ansi_current_mixed--Debug_/opt.yql"
+            "checksum": "ab7f9a9bc42168fdc4d6d8023c5ce625",
+            "size": 5913,
+            "uri": "https://{canondata_backend}/1773845/93025151756e8a3baa2a40af8d1560ff269706a9/resource.tar.gz#test.test_window-current_ansi_current_mixed--Debug_/opt.yql"
         }
     ],
     "test.test[window-current/ansi_current_mixed--Plan]": [
@@ -2895,9 +2895,9 @@
     ],
     "test.test[window-win_func_first_last_with_part--Debug]": [
         {
-            "checksum": "bf55c1023314adc3bcbf2ad024e52268",
-            "size": 4889,
-            "uri": "https://{canondata_backend}/1923547/5154c8bd8ef9ead4f609771f831f20c15e795571/resource.tar.gz#test.test_window-win_func_first_last_with_part--Debug_/opt.yql"
+            "checksum": "dd8f5fce9684895e45c05b01c6ff401b",
+            "size": 4978,
+            "uri": "https://{canondata_backend}/1937429/7c8e1b4be8a277d91c54ba1b59ff6749099818ee/resource.tar.gz#test.test_window-win_func_first_last_with_part--Debug_/opt.yql"
         }
     ],
     "test.test[window-win_func_first_last_with_part--Plan]": [
@@ -2909,9 +2909,9 @@
     ],
     "test.test[window-win_func_first_last_with_part--Results]": [
         {
-            "checksum": "6392c80fcb01d1b0197312e9d4072dd5",
+            "checksum": "874242d10426971cdded0662add81cdf",
             "size": 10502,
-            "uri": "https://{canondata_backend}/1923547/5154c8bd8ef9ead4f609771f831f20c15e795571/resource.tar.gz#test.test_window-win_func_first_last_with_part--Results_/results.txt"
+            "uri": "https://{canondata_backend}/1937429/7c8e1b4be8a277d91c54ba1b59ff6749099818ee/resource.tar.gz#test.test_window-win_func_first_last_with_part--Results_/results.txt"
         }
     ],
     "test.test[window-win_func_rank_by_opt_part--Debug]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json
index aa475e74683e..7313733a29c8 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part19/canondata/result.json
@@ -2733,9 +2733,9 @@
     ],
     "test.test[window-win_func_part_by_expr--Debug]": [
         {
-            "checksum": "31b2d4c3a183c3acf554cbb380c77fad",
-            "size": 4181,
-            "uri": "https://{canondata_backend}/1937027/16b7289b1b8f5fdff728155d836fa2b238949b2d/resource.tar.gz#test.test_window-win_func_part_by_expr--Debug_/opt.yql"
+            "checksum": "c59b4945d329d2aa8495be0aac78f187",
+            "size": 4238,
+            "uri": "https://{canondata_backend}/212715/9518168d6010f7efa9fb146e73ce91006d058cad/resource.tar.gz#test.test_window-win_func_part_by_expr--Debug_/opt.yql"
         }
     ],
     "test.test[window-win_func_part_by_expr--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json
index 4ff84a7f8121..6a2b074791e1 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part3/canondata/result.json
@@ -2167,9 +2167,9 @@
     ],
     "test.test[window-win_func_aggr_hist--Debug]": [
         {
-            "checksum": "5340863d9c7eda433f306dd3e0851058",
-            "size": 5464,
-            "uri": "https://{canondata_backend}/1937001/501db203b8231f91537ae2b97c666fbbeac7d8f3/resource.tar.gz#test.test_window-win_func_aggr_hist--Debug_/opt.yql"
+            "checksum": "e854f73d11d9baa824d5c332dc4632b9",
+            "size": 5516,
+            "uri": "https://{canondata_backend}/1871002/862ae8c3c07a5f792e98576ee564d5bcf74129e0/resource.tar.gz#test.test_window-win_func_aggr_hist--Debug_/opt.yql"
         }
     ],
     "test.test[window-win_func_aggr_hist--Plan]": [
diff --git a/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json b/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
index 1e3f153cd49d..4704d36c6a13 100644
--- a/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
+++ b/ydb/library/yql/tests/sql/yt_native_file/part8/canondata/result.json
@@ -2732,9 +2732,9 @@
     ],
     "test.test[window-current/ansi_current--Debug]": [
         {
-            "checksum": "ee0dddfef049fb569ba1b5ed61e0f22f",
-            "size": 4164,
-            "uri": "https://{canondata_backend}/1781765/de147e1386c9b98546ba3e14eb71ae4a038b981c/resource.tar.gz#test.test_window-current_ansi_current--Debug_/opt.yql"
+            "checksum": "9c0d2970eca577f8128adf94a3f84b91",
+            "size": 4224,
+            "uri": "https://{canondata_backend}/1937001/f4178a40ed6b322984053667a9324002d6f97879/resource.tar.gz#test.test_window-current_ansi_current--Debug_/opt.yql"
         }
     ],
     "test.test[window-current/ansi_current--Plan]": [